926a3f5350f0ba5f6a52009d75fc042744b9a8a1,portal-impl/src/com/liferay/portlet/imagegallery/lar/IGPortletDataHandlerImpl.java,IGPortletDataHandlerImpl,importFolder,#PortletDataContext#boolean#Map#IGFolder#,326

Before Change


		long userId = context.getUserId(folder.getUserUuid());
		long plid = context.getPlid();

		Long parentFolderId = (Long)folderPKs.get(
			new Long(folder.getParentFolderId()));

		if (parentFolderId == null) {
			parentFolderId = new Long(folder.getParentFolderId());
		}

		boolean addCommunityPermissions = true;
		boolean addGuestPermissions = true;

		IGFolder existingFolder = null;

		try {
			if (parentFolderId.longValue() !=
					IGFolderImpl.DEFAULT_PARENT_FOLDER_ID) {

				IGFolderUtil.findByPrimaryKey(parentFolderId.longValue());
			}

			if (mergeData) {
				existingFolder = IGFolderUtil.fetchByUUID_G(
					folder.getUuid(), context.getGroupId());

				if (existingFolder == null) {
					existingFolder = IGFolderLocalServiceUtil.addFolder(
						folder.getUuid(), userId, plid,
						parentFolderId.longValue(), folder.getName(),
						folder.getDescription(), addCommunityPermissions,
						addGuestPermissions);
				}
				else {
					existingFolder = IGFolderLocalServiceUtil.updateFolder(
						existingFolder.getFolderId(),
						parentFolderId.longValue(), folder.getName(),
						folder.getDescription(), false);
				}
			}
			else {
				existingFolder = IGFolderLocalServiceUtil.addFolder(
					userId, plid, parentFolderId.longValue(), folder.getName(),
					folder.getDescription(), addCommunityPermissions,
					addGuestPermissions);
			}

After Change


		long userId = context.getUserId(folder.getUserUuid());
		long plid = context.getPlid();

		long parentFolderId = MapUtil.getLong(
			folderPKs, folder.getParentFolderId(), folder.getParentFolderId());

		boolean addCommunityPermissions = true;
		boolean addGuestPermissions = true;